Autogenerated HTML docs for v1.7.5-52-ge839f
diff --git a/git-config.html b/git-config.html index 31d1ff0..a606844 100644 --- a/git-config.html +++ b/git-config.html
@@ -1451,7 +1451,6 @@ for most projects as source code and other text files can still be delta compressed, but larger binary media files won’t be.</p></div> <div class="paragraph"><p>Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are supported.</p></div> -<div class="paragraph"><p>Currently only <a href="git-fast-import.html">git-fast-import(1)</a> honors this setting.</p></div> </dd> <dt class="hdlist1"> core.excludesfile @@ -2128,6 +2127,17 @@ </p> </dd> <dt class="hdlist1"> +diff.ignoreSubmodules +</dt> +<dd> +<p> + Sets the default value of --ignore-submodules. Note that this + affects only <em>git diff</em> Porcelain, and not lower level <em>diff</em> + commands such as <em>git diff-files</em>. <em>git checkout</em> also honors + this setting when reporting uncommitted changes. +</p> +</dd> +<dt class="hdlist1"> diff.mnemonicprefix </dt> <dd> @@ -2208,17 +2218,6 @@ </p> </dd> <dt class="hdlist1"> -diff.ignoreSubmodules -</dt> -<dd> -<p> - Sets the default value of --ignore-submodules. Note that this - affects only <em>git diff</em> Porcelain, and not lower level <em>diff</em> - commands such as <em>git diff-files</em>. <em>git checkout</em> also honors - this setting when reporting uncommitted changes. -</p> -</dd> -<dt class="hdlist1"> diff.suppressBlankEmpty </dt> <dd> @@ -2228,14 +2227,74 @@ </p> </dd> <dt class="hdlist1"> +diff.<driver>.command +</dt> +<dd> +<p> + The custom diff driver command. See <a href="gitattributes.html">gitattributes(5)</a> + for details. +</p> +</dd> +<dt class="hdlist1"> +diff.<driver>.xfuncname +</dt> +<dd> +<p> + The regular expression that the diff driver should use to + recognize the hunk header. A built-in pattern may also be used. + See <a href="gitattributes.html">gitattributes(5)</a> for details. +</p> +</dd> +<dt class="hdlist1"> +diff.<driver>.binary +</dt> +<dd> +<p> + Set this option to true to make the diff driver treat files as + binary. See <a href="gitattributes.html">gitattributes(5)</a> for details. +</p> +</dd> +<dt class="hdlist1"> +diff.<driver>.textconv +</dt> +<dd> +<p> + The command that the diff driver should call to generate the + text-converted version of a file. The result of the + conversion is used to generate a human-readable diff. See + <a href="gitattributes.html">gitattributes(5)</a> for details. +</p> +</dd> +<dt class="hdlist1"> +diff.<driver>.wordregex +</dt> +<dd> +<p> + The regular expression that the diff driver should use to + split words in a line. See <a href="gitattributes.html">gitattributes(5)</a> for + details. +</p> +</dd> +<dt class="hdlist1"> +diff.<driver>.cachetextconv +</dt> +<dd> +<p> + Set this option to true to make the diff driver cache the text + conversion outputs. See <a href="gitattributes.html">gitattributes(5)</a> for details. +</p> +</dd> +<dt class="hdlist1"> diff.tool </dt> <dd> <p> - Controls which diff tool is used. <tt>diff.tool</tt> overrides - <tt>merge.tool</tt> when used by <a href="git-difftool.html">git-difftool(1)</a> and has - the same valid values as <tt>merge.tool</tt> minus "tortoisemerge" - and plus "kompare". + The diff tool to be used by <a href="git-difftool.html">git-difftool(1)</a>. This + option overrides <tt>merge.tool</tt>, and has the same valid built-in + values as <tt>merge.tool</tt> minus "tortoisemerge" and plus + "kompare". Any other value is treated as a custom diff tool, + and there must be a corresponding <tt>difftool.<tool>.cmd</tt> + option. </p> </dd> <dt class="hdlist1"> @@ -2423,6 +2482,26 @@ </p> </dd> <dt class="hdlist1"> +filter.<driver>.clean +</dt> +<dd> +<p> + The command which is used to convert the content of a worktree + file to a blob upon checkin. See <a href="gitattributes.html">gitattributes(5)</a> for + details. +</p> +</dd> +<dt class="hdlist1"> +filter.<driver>.smudge +</dt> +<dd> +<p> + The command which is used to convert the content of a blob + object to a worktree file upon checkout. See + <a href="gitattributes.html">gitattributes(5)</a> for details. +</p> +</dd> +<dt class="hdlist1"> gc.aggressiveWindow </dt> <dd>
